From 8a3b0417ddf2f41592cdbc560c7e1f0ee2414d0c Mon Sep 17 00:00:00 2001 From: Debian OpenLDAP Maintainers Date: Sat, 12 Jan 2019 19:18:03 +0000 Subject: [PATCH] contrib-makefiles Gbp-Pq: Name contrib-makefiles --- contrib/slapd-modules/passwd/Makefile | 2 +- contrib/slapd-modules/passwd/pbkdf2/Makefile | 2 +- contrib/slapd-modules/smbk5pwd/Makefile | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/passwd/Makefile index b4f2b93c..34cd1e1c 100644 --- a/contrib/slapd-modules/passwd/Makefile +++ b/contrib/slapd-modules/passwd/Makefile @@ -13,7 +13,7 @@ DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -PROGRAMS = pw-kerberos.la pw-netscape.la pw-radius.la pw-apr1.la +PROGRAMS = pw-netscape.la pw-apr1.la LTVER = 0:0:0 prefix=/usr/local diff --git a/contrib/slapd-modules/passwd/pbkdf2/Makefile b/contrib/slapd-modules/passwd/pbkdf2/Makefile index 64ad97c9..6e2e1883 100644 --- a/contrib/slapd-modules/passwd/pbkdf2/Makefile +++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile @@ -12,7 +12,7 @@ OPT = -g -O2 -Wall #DEFS = -DSLAPD_PBKDF2_DEBUG INCS = $(LDAP_INC) -LIBS = $(LDAP_LIB) -lcrypto +LIBS = $(LDAP_LIB) -lnettle PROGRAMS = pw-pbkdf2.la LTVER = 0:0:0 diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile index 2f68b704..c95bd849 100644 --- a/contrib/slapd-modules/smbk5pwd/Makefile +++ b/contrib/slapd-modules/smbk5pwd/Makefile @@ -19,10 +19,10 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la SSL_INC = -SSL_LIB = -lcrypto +SSL_LIB = -lnettle -HEIMDAL_INC = -I/usr/heimdal/include -HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv +HEIMDAL_INC = $(shell krb5-config.heimdal --cflags kadm-server) +HEIMDAL_LIB = $(shell krb5-config.heimdal --libs kadm-server) LIBTOOL = $(LDAP_BUILD)/libtool CC = gcc @@ -30,7 +30,8 @@ OPT = -g -O2 -Wall # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it. DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) -LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) +# put /usr/lib/heimdal before /usr/lib in case libkrb5-dev is installed, #745356 +LIBS = $(HEIMDAL_LIB) $(LDAP_LIB) $(SSL_LIB) PROGRAMS = smbk5pwd.la LTVER = 0:0:0 -- 2.30.2